OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)
commit545c8eed678101a836972c5f68941078f7fb0863
tree7edaf389b022487dccfcc87cc6845fa71f6dd4f5
parent964c6321ae015522c9f7e26d47189890b636a592
parentb225d8b17ee61f0cfe4fb14e7153826183872b00
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa