diff options
| author | Fred Chung <fchung@google.com> | 2013-07-22 18:25:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-22 18:25:54 +0000 |
| commit | 63bc4aaf4cef9e82fd6554f6a06f64815b809c6e (patch) | |
| tree | 67d93f0266b4220250ffc0f566b3a97dc5dc9ad5 /samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java | |
| parent | c821270d716ca73a998ece17c9d5bf593bdf590e (diff) | |
| parent | b71371d3afe04a9c79f38ddea4ab02664c9b908d (diff) | |
Merge "App restriction for restricted profile sample." into jb-mr2-dev
Diffstat (limited to 'samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java')
0 files changed, 0 insertions, 0 deletions