commit | a5f4e79fad39b4a0f91673c5813b1740e82144f4 | [log] [tgz] |
---|---|---|
author | Selim Gurun <sgurun@google.com> | Tue Apr 23 12:20:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 23 12:20:53 2013 -0700 |
tree | 2936bd568cea81b00b5b83a3316b19f08885e1d7 | |
parent | 04f3b81aad12d5d28db42db40545603c6b128c1f [diff] | |
parent | 22a946d36af4ea69956531c89f0d0852497c3892 [diff] |
am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge * commit '22a946d36af4ea69956531c89f0d0852497c3892': DO NOT MERGE Fix issues during backport