| commit | 0c689c4804a9fd5c9417f638d2047aa3135e8e56 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:49:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:49:04 2012 -0700 |
| tree | fd95618db52429a43ae8d50abf32809ab4cb927c | |
| parent | 075e0938e1413b6743f51baa5260cd9c8dea0711 [diff] | |
| parent | 8c541b1dd37a8b2bdc0a2987b63a044f06965e54 [diff] |
am b060fe28: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b060fe28670601e6885f6375a9c06124a5be7389':