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

Change-Id: Ifaae267f3be9b1bf759f6093eb331c2751b2565f