| commit | f3a736e8f043419f95cfa879b8f4ee5b8efc5223 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:56:46 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:56:46 2012 -0800 |
| tree | a38f7e2c17e7824bf28f0b600fff1bdc62be5a2c | |
| parent | b5fe96b8130b5bacbc1762ba7f819a9f9b72bf59 [diff] | |
| parent | 7bd5a76e2e89ca6d172539ef2dfa43f42f07c001 [diff] |
am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':