OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:42:53 +0000 (05:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:42:53 +0000 (05:42 -0700)
commit5b75f3bfa1a8f380ce213a0088afec7a7901a25b
tree1cf444dc3ee0a585a2af2624493798e822702cad
parent0a7fe991530308fbae9ca033c0045bfc27a7f4c1
parentd146e8e4e922aa272aa4c088fd6122836c8f45ca
Reconcile with jb-mr2-release - do not merge

Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc