OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)
commitdcaf8c340a18f6d2a848fc23e57b63404052ce2a
tree99d99679207653edc3421e8035afb99e6613e5fb
parent585332c9e4ea588ccb310c6fa8b1137c6a6086be
parent245240803a41b113f7e648b9bf6c8f07d0e0b6e7
Reconcile with jb-mr2-release - do not merge

Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21