OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)
commit1a0f6725392279ed6b44e97b00315b8173abf454
treec682bf452f01983f3f0badeea4acd926c8427382
parent021ff2ee388bdb548ae55b349535d14e0423207c
parentadd1fb46074d58d2528b7fad1e9c62a2526b9ab1
Reconcile with jb-release - do not merge

Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e