| commit | bf1514fdcfc60b303a2d3f35cd7785ceff76ac57 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:54:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:54:37 2012 -0700 |
| tree | 0700233aa8c7f56ecd041a13ae58096906f44f45 | |
| parent | 22ea2a0315bb91ad175b2d0303c1a4959abec33f [diff] | |
| parent | 6bd90a3ce2d6d9f013a8606477093f59bddf3650 [diff] |
am 6bd90a3c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '6bd90a3ce2d6d9f013a8606477093f59bddf3650':