| commit | 3d3c7ab8153149ef521e4c64703dd5f9c60bf3b7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:17:40 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:17:40 2012 -0800 |
| tree | 21b7184eb71b6f618042b203ade090201d47a317 | |
| parent | 6a172a167e3741862204c679492641fd26c29055 [diff] | |
| parent | dcec4836a7e8153b172db27c10c49fa5d11e684c [diff] |
am dcec4836: (-s ours) am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge * commit 'dcec4836a7e8153b172db27c10c49fa5d11e684c':