OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)
commit4ec98335bab7a94bd583ac57da2711eb8abc0f14
tree571f958e0953894c88befb54d0e1a40545510e37
parentc46bd076ffc46581a38e518a852e62f8932adf16
parent341d8f8ee6bee2f5bc6df3ad54750c1c4c44306e
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e