commit | bc4bcf4ad0d4be53235e949098b7cbd45b30b8c8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:31:11 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:31:11 2012 -0800 |
tree | 66560b1b15c06e1db31f93160bc2f052bdbe172d | |
parent | 2c76626789453bb9734ced4b5aab318260bff795 [diff] | |
parent | daa3e04e485a037b38ff0d97a04fb1e0d139b143 [diff] |
am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge * commit 'daa3e04e485a037b38ff0d97a04fb1e0d139b143': JOP40C JOP40B