OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:37 +0000 (13:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:37 +0000 (13:35 -0700)
commit0496604fd45a8bd1350ac6f6cdf61f3cc4201f04
tree314daa5099deedf94e42bfc625eb221fd450f52f
parent0ba2138b8432aafc612254cde789901a5eafd731
parentbf6cf5a769c5723d8196fb80e610873e4ad33e24
Reconcile with jb-mr2-release - do not merge

Change-Id: I12735409da99db414a4ea7cbd9a7f4862fc4447a