| commit | 7d960c961875a5d7ad6d577974c0e3e2b17cf51e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 03 18:05:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 18:05:31 2013 -0700 |
| tree | 23135b85ed389619861d43f3f467cc99b1273a85 | |
| parent | 294c9ce2177a24d5034b81e965373ff1d3287178 [diff] | |
| parent | a7672f42478fae4150b32e5210fc6eb8f1b17bb1 [diff] |
am a7672f42: Reconcile with jb-mr2-release - do not merge * commit 'a7672f42478fae4150b32e5210fc6eb8f1b17bb1':