commit | d2cd0f05a2ba440d0d55cb15ca8c575b25ecb377 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:02:50 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:02:50 2012 -0700 |
tree | 25b7dd0bc8db0ed82d8c63636d0d2d78d5765af7 | |
parent | 2693152ec0f8cf808a0669828d361fb4033008a5 [diff] | |
parent | e1e67b6552f2ba2696f2418393f052bda9739d63 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Id3d564f85a9a157a34937324d65e322c584f7cdc