commit | 2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:06 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:57:06 2012 -0700 |
tree | f5d7b5a06cd58cfc7c7bfa2acfae16f5278644b1 | |
parent | cb3911d30c515e06fbea0000af02fa3d09688943 [diff] | |
parent | a71766561fb4b411dc977377f73283e6ab410d07 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81