OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:27 +0000 (10:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:27 +0000 (10:46 -0700)
commita53807ddd815be36f0992576f2260f486206766d
tree0e2fef41f167c65894413400380994be675da2b6
parent9217185d74dad396ea87e4b82597c0fe2d949efe
parent375a27daa645a4ed7b4302f724801056d2704774
Reconcile with jb-mr2-release - do not merge

Change-Id: Ie31f29c0b7587e4567140530b6f8bd199b0e5a79