| commit | c47d63d103ebe5279cae0758069190d685056ed2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 12:36:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 12:36:46 2012 -0700 |
| tree | 9c465a1dded9f40ed5c3ee3a802178c9566c53d5 | |
| parent | 68b3f065b617d6cdcf0e528cfe4bf92b89b20445 [diff] | |
| parent | 3401c2e9e1343c964eb9495cbf8568172c14ac82 [diff] |
am 3401c2e9: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '3401c2e9e1343c964eb9495cbf8568172c14ac82':