commit | c90e9c150f9a96d7e4c1bd936ce79028ff78c076 | [log] [tgz] |
---|---|---|
author | Wei Liu <luciferleo@google.com> | Thu Sep 10 04:12:58 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 04:12:58 2015 +0000 |
tree | a38ea34f568c07797522b24299c5382594141617 | |
parent | b57514ad9044002dfeefbd3e4b361e9956dd4084 [diff] | |
parent | 7a058bffb1252c3dcb90d9e258de13f7736c44b4 [diff] |
am 7a058bff: am cd12f845: am ff248435: Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev * commit '7a058bffb1252c3dcb90d9e258de13f7736c44b4':