OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)
commit8d4e5f1166118f3c2c5e1c83e03fc4f38088aa52
tree81e834d34dfbfbd48a47290d59f4a24ad13d695a
parenta6e705ea46c764d4abc1ec08a6338a670c89d313
parent604ffe96de24a72edf8bd50a9c630b05d6c81b4f
Reconcile with jb-mr2-release - do not merge

Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331