| commit | 4597de963f06a31511378bcb2c09f2972bd46e00 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 11 07:47:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 07:47:08 2013 -0700 |
| tree | a0e45abcd6b2acb9dccd65f37cb56ffccc1ec313 | |
| parent | a53e665dac153fb174d84b6a538a8e044a4d5c32 [diff] | |
| parent | 6a92b35e3a64c90127fb87530c50e9a04a61c671 [diff] |
am 6a92b35e: Reconcile with jb-mr2-release - do not merge * commit '6a92b35e3a64c90127fb87530c50e9a04a61c671':