OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)
commitd50926a047d51f950cbe6c7588d4b168e0cfc3bb
tree2a54509d4aae599873fe33951d4f504d5a14b068
parentdcce7ca6a82cf08a7047d0fd23ba05b47be831c1
parentb097af827960d37cfeca90a7ec0eb6d820fd192a
Reconcile with jb-mr0-release - do not merge

Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc