| commit | e1540e4718191e36070e302dbebb9e142bfac9f8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:54:45 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:54:45 2012 -0800 |
| tree | 069b46a235d3a1da2f1aa938ef47d36c40eb0807 | |
| parent | 334808db4bb7456b3f440f7df65766657a4246c1 [diff] | |
| parent | b5436a9287fa5055d65351da3cd9c3cea71a9342 [diff] |
am b5436a92: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'b5436a9287fa5055d65351da3cd9c3cea71a9342':