OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:54:36 +0000 (11:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:54:36 +0000 (11:54 -0800)
commit2b366f1eab4d723a9bf06c616b2d23c262164939
treea63be025f117ba8823f7dff83e012db181952546
parent9745d080caa572dd85f3e0bacd936c8ca4e2b7a6
parentf1a68580777cf0c3a9034d2b3a5e42c9a245d54c
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I59ea8b8ba720db95748416f5a44e385ff05cf024