OSDN Git Service

am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
authorSelim Gurun <sgurun@google.com>
Tue, 23 Apr 2013 19:20:53 +0000 (12:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Apr 2013 19:20:53 +0000 (12:20 -0700)
commita5f4e79fad39b4a0f91673c5813b1740e82144f4
tree2936bd568cea81b00b5b83a3316b19f08885e1d7
parent04f3b81aad12d5d28db42db40545603c6b128c1f
parent22a946d36af4ea69956531c89f0d0852497c3892
am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge

* commit '22a946d36af4ea69956531c89f0d0852497c3892':
  DO NOT MERGE Fix issues during backport