diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-08-16 18:56:21 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-08-16 18:56:21 -0700 |
commit | 01498bdccde052488c70f2e5f6787ee5b708b5fb (patch) | |
tree | 64eef939234bdaa362b9395d46b8d5682122105f | |
parent | b84f1c0e2e9375f46c752afd5a30d827df8d6c32 (diff) | |
parent | 69e798a7745554b7987c1ee1edc334cbc0dd62ac (diff) | |
parent | c6d923fc1c3b47bd53c5d6a3743d187641537e6a (diff) | |
download | stingray-01498bdccde052488c70f2e5f6787ee5b708b5fb.tar.gz |
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I57bc1ed166a74567b7c7c215251c4b4a9a520f26