| commit | 8ba2a20617bbc01cff494464bf80d0fa313fddae | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 08:31:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 08:31:26 2012 -0700 |
| tree | d0c142e7996c22f0fe450562ccde368e94ae2014 | |
| parent | ae1d5bd6dc322705aeb4742d488e5a4ab8db7845 [diff] | |
| parent | 792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d [diff] |
am 792d945e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d':