| commit | 16b2fb0102c1f75f6a469424c54bbe4c6fe6485b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:45:00 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:45:00 2012 -0800 |
| tree | 5a23baa1fd04ecca6c16474f0c3192060f036aed | |
| parent | 60351b627f2ff77077d56da20b459ac9dec9c615 [diff] | |
| parent | 35eab7fde0e9bb838576450e0d7b47652b2c50c8 [diff] |
am 35eab7fd: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '35eab7fde0e9bb838576450e0d7b47652b2c50c8':