OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
commite96b631b07bc8c08d32c86ec5fedc62cfcbee7d4
treeba02c8667186c7f362b09cc72f3621b13feca49d
parent8481c661729888b86f2958de3ac3f4008bcac078
parentd2132589c1826efaba91124c7b6e9a9cc4e12bc1
Reconcile with jb-mr2-release - do not merge

Change-Id: If28ee81947b5975843ee6843824e5f7069333251