commit | 9e7f65fdc941f9e35faddc5d117bcb40aa91b09a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:04:59 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:04:59 2012 -0700 |
tree | 239557d4f3216b5e6df2802cfcedee87a4011ae7 | |
parent | ca5aae2425a88ddc0bdf7f03569848fd67e603d2 [diff] | |
parent | 0c1c3948d3d28892b1c281bbe3997f66315d4ad1 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b