OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000 (09:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000 (09:49 -0700)
commit4f649fbafaa98fdbd26340d5e50c8a5429cf4a8a
tree904da930b3611115453ebb9b888a3adcad8d74c2
parent85b8fb58e7363f4dde31ab7fd12d3df51910785b
parentaee1d0a4fb44a8bb1b2b62a734b5eff05f4661ae
Reconcile with jb-mr2-release - do not merge

Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07