OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
commitee5fbff2e65297f91609ddc523e4f56915dc8dcf
tree45e3158206a805f87e4c481cbad83134a9a53f45
parentd20402541703a5b06d8ce2f313fc475c02269407
parent7dca39d8b25676c6400c75a70d6ac8a498441270
Reconcile with jb-mr2-release - do not merge

Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00