OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:35 +0000 (09:47 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:35 +0000 (09:47 -0800)
commit31e8485028e93c16312c57b5bb6b511e3bc8582d
tree92cae0d04c72a79467a66e62bfdf542a18df2c30
parenta7da0dda39cf1e807eea1304b48d4583e7329b72
parent282b79d7c12485ea20ff432b71290b8b992ecca8
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4