commit | b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 15:58:04 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 15:58:04 2012 -0800 |
tree | 190786785a6492e7d34a4539c477b224ab565d87 | |
parent | 0f4e3718dff489f25ff5d6a1431a37a18bef52f4 [diff] | |
parent | 6d302128db33a94de5a85ee3c3a90c010b929056 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9