commit | ca5aae2425a88ddc0bdf7f03569848fd67e603d2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:17 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:17 2012 -0700 |
tree | 239557d4f3216b5e6df2802cfcedee87a4011ae7 | |
parent | 9349b5108c3763337868ffc5de51330c00d6db04 [diff] | |
parent | a9e3004d69a6f755a9f5f4a481e9d03e56ef9dd1 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803