OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:53:49 +0000 (11:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:53:49 +0000 (11:53 -0800)
commit7c6658ea71f5aa3a3614cd2dbde123b831850e55
treed49f7a8817419c93ad64c77dc8acabde709a71e3
parent7cd204914ef59c4ce96210539489ec3e76942bb4
parentaa81ebb808db18285dabf0d6b3bc33a2bb0c7045
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4