diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:42:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:42:05 -0700 |
| commit | 24d5c600c3cce1491752ee20980d80ecc759770f (patch) | |
| tree | 4b6893fbd91482a17379b93b57a4dc04b7841c67 | |
| parent | 16f00894d5cc48d0814cc5d061e8373cbb514389 (diff) | |
| parent | a78a91d6e6786adf07285cbf8bf330fcc080e488 (diff) | |
| download | media-jb-mr1.1-dev.tar.gz | |
am a78a91d6: (-s ours) am 068cec11: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit 'a78a91d6e6786adf07285cbf8bf330fcc080e488':
0 files changed, 0 insertions, 0 deletions