summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-05-16 08:41:14 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-05-16 08:41:14 -0700
commit5f728e907ce9370732d457cb48fd771963765b3f (patch)
tree31f673ce2f4b49b340d6ef37e466a6c9a263ed68
parentf893f324710cde1cc5e0f551832692610ee4513c (diff)
parentd7ea7038239847ad1033012ff4a61b8e2e086f21 (diff)
parentd7ea7038239847ad1033012ff4a61b8e2e086f21 (diff)
downloadbluetooth-5f728e907ce9370732d457cb48fd771963765b3f.tar.gz
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Iba78ea27bcf56a64b7cbe9eae6d81291e6dd81e9