commit | f7476e6348dc8716d1bcc05d4a7588e1292dceff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:35:41 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:35:41 2013 -0700 |
tree | f31083549b6a1df76d3ae9ecec9027ee852f129e | |
parent | ae045e45a890e2e442f8da20eca1394fbf82698c [diff] | |
parent | 01a551a48d0b62dee4ed15e14b10276a5bc2e7c6 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I5b19656a1b7b45ac21573bdbc1c8f13b22792c45