OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:18 +0000 (09:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:18 +0000 (09:18 -0700)
commitac23f408a87437685d3d4a2b4005b981ca01e425
tree8fbf7aba2a4bef05792cde43fdc9b5f3b312a331
parentbc85f483014bc24471b68867ecfed2a4aa5c0b15
parent08c0e3c6716d322c5237efdf3b941b7decbf175d
parent62a27b6f4aacca6daa6d4f43d0e4894b5326ba4f
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I6a2777a25426e69caf568c39823597c86aaa1c61