| commit | bb4ed4947c5945c0d9b3a780c0ea30759c916d7f | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Sep 09 05:29:20 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 09 05:29:21 2014 +0000 |
| tree | e7f42fa7766faa3f62c6189a0b734134225b2813 | |
| parent | 3256adc666b183253972a472d3a6cd45e7fb989e [diff] | |
| parent | 20ec4fa2294a91e5ff87839280904aba4a050cf6 [diff] |
Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp