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:36:23 +0000 (13:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:36:23 +0000 (13:36 -0700)
commit9cacd519354bb5249a9cc3ac05d3220748c24a16
tree83975379e6211a87205d10d674e01d7bceebfcce
parent469bc0efed25ec4a8d40bfdfa3997931eb1a7383
parentdd363d3b6176d075a67b786c7209d306471c9294
Reconcile with jb-mr2-release - do not merge

Change-Id: I4014afe3d67f5b17d5877083bdea8e34bf32ab9e