OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
commitcaaddf4a80cbb81cefdda3dbdafb74f319c2872e
treec2d7c6b12bf5299f33a0aa588f7a624e27b2eb30
parentd3523bb712beb8a4bf6a0a47cc7a594ea2c874f7
parentcc4ebbd29a749aaff363be709f5c89b31411d994
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4