summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-27 07:33:36 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-11-27 07:33:36 -0800
commit365ce897f96915c2a303dbfe85937ecb395a7a1d (patch)
tree848215b7a99366aba1896b2e7bc2357f97ac00c9
parent9eb1a4fc659f58d196cc8e990da2a3fbf9a1c630 (diff)
parent786a53720cff310032e2ddef7756e7d9d08e6a34 (diff)
parent014d19fa3d557cfc931b3dd5ecf8cdedc591d6ca (diff)
downloadaudio-365ce897f96915c2a303dbfe85937ecb395a7a1d.tar.gz
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ib9d689c7e8ac4eca802f694d6dbd902653eb84f1