| commit | 96081bfb11e012d3bd6729348c1b0ed471f95c6e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Mar 21 05:24:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 05:24:33 2015 +0000 |
| tree | c9dba989b53de255162849bf34b5703b416f98bb | |
| parent | a39101d68eb9d4d6f810c868384e8e8346636b64 [diff] | |
| parent | 192f14db57d0e4eedf9236659cdb1e1df6a48481 [diff] |
am 192f14db: am 2aa06dbe: am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev * commit '192f14db57d0e4eedf9236659cdb1e1df6a48481':