| commit | 559b30a10ef57d318caa22c336d912ffc03a6970 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:18 2012 -0800 |
| tree | 152b501788a5279f3baf903dacdd35be984816d0 | |
| parent | cecd9e46ab814dc7bc72efa9adda6ddc88707c02 [diff] | |
| parent | 29ae16e058274d99dc02f91d84af6ca5222b3c52 [diff] |
am 29ae16e0: (-s ours) am a795ab85: am c39ee474: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '29ae16e058274d99dc02f91d84af6ca5222b3c52':