| commit | a7fcde9c0a87582b14595a9e700dfde1b0fad4d1 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 18:38:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:38:58 2015 +0000 |
| tree | e89d89e8e9439ccbec80fc1817ef7f7b3d6a73ac | |
| parent | 9b454727f60acf3a50059394662982933eac3373 [diff] | |
| parent | 436080705c1ee0e88e93e969774ad15f3c83e8d4 [diff] |
am 43608070: am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev * commit '436080705c1ee0e88e93e969774ad15f3c83e8d4':