OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)
commit28ac489c21587e30bf1a509b4e52bd10feb06b9e
tree7c87d999ada0548db422e0912c604d784ae39bd3
parentb4882f5d4788a8fa81d8db3031d2bc6e7459eea3
parent3a305ea742e96ee4b5477bfe024a33fc853c7c28
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879