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:16:28 +0000 (09:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:16:28 +0000 (09:16 -0700)
commitaf40b4e5a4778313433ce9612c51ba367acf8d66
treeee2b2298c8dec2c4f4b506d74b96267f00b25292
parentf368213fa92b11482f0d5807dc149f405dd8e62f
parent6de35d839f3d5098c6b81ccc919b1f8737644b45
parent31322d321437a18bb761b73964418cc83fd7a1df
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I99d44c2e57eba3b98e5d217591968559fa3d1fe3