diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:23:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:23:07 -0700 |
| commit | 6b0409dbc4f33e4adc30390b934c930a5cda4b21 (patch) | |
| tree | 38e7a79da20cf168bc915745e26ce95f226627e3 | |
| parent | a918fec5a1dc028e9b04a71d0e37ee1bab6caa61 (diff) | |
| parent | 92be9d34bf220d26f49ed1b328a84d3cad84d21f (diff) | |
| download | android_frameworks_ex-6b0409dbc4f33e4adc30390b934c930a5cda4b21.tar.gz android_frameworks_ex-6b0409dbc4f33e4adc30390b934c930a5cda4b21.tar.bz2 android_frameworks_ex-6b0409dbc4f33e4adc30390b934c930a5cda4b21.zip | |
am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '92be9d34bf220d26f49ed1b328a84d3cad84d21f':
0 files changed, 0 insertions, 0 deletions