OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:09 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:09 +0000 (05:44 -0700)
commitd668d74408d7c6c71dfbc04e12da7ce1ff9e2af1
tree906d98d23f6afa4fb2188f4cfd89325d3076d94b
parent010ab3bd92f17b634e962f4a4ea20f1bcc3490e6
parent8ef742c22887f3cb7243e17654007d794f2757a9
Reconcile with jb-mr2-release - do not merge

Change-Id: Iae037f50e82720a2eb374281a91bb9638b8f7985