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:44:03 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:03 +0000 (05:44 -0700)
commitcd168d344fe9c36ea31505939af5fcb925e5acd7
tree2be5b87cc8feecb731a9c8998905d49e0db2213f
parent04d952217a2dd51b86ddecbe4dc56f98329d78a2
parent64a5bedd6c2677db32782810408ed0dccc8515ed
Reconcile with jb-mr2-release - do not merge

Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7