OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:23:06 +0000 (13:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:23:06 +0000 (13:23 -0700)
commitad808f5da422b13489edb04b38daf871e5f977a6
tree80db74d598cf9afe53b864409409ec57ebade51d
parent2461af44c1c1e2684b56e7c9c62fb69cc42b10e5
parentd842ff1660ccf606dcd5fd60f722ebd5149fd32c
Reconcile with jb-release - do not merge

Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a