OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 May 2013 22:28:34 +0000 (15:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 May 2013 22:28:34 +0000 (15:28 -0700)
commitf35f6ce75375b05634a0acb332635e1954058336
treecf1f47dc608c875a4bfe2aee97727d4c279e4f7b
parent38b8cae3876ce1c02d6da310ad93fb31d9c5a9ed
parentcf1466f693b0f3880c6853121e323137e46595cc
Reconcile with jb-mr2-release - do not merge

Change-Id: I03fc6d2dac608cdc0e0c83a87cc90b821f4be52c