OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:27:40 +0000 (07:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:27:40 +0000 (07:27 -0700)
commit3b90b0868fb7d71c893998562be2ba9c455b509d
treef37102e0a393ec68e98575fb88dd52c63149b0a7
parent16204b6af7303fcaffb5caa9b7fa4be4587743c4
parent3618379ed8b07d428f593d6a130029c246c1ef60
Reconcile with jb-mr1-release - do not merge

Change-Id: I0a15906b6b86c84c785eb57cde0b202a3b0a97cf