| commit | 1f2046b2099318905b425ef824da063cea995d28 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jul 14 20:39:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:39:54 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | 897765a04e77da1a7e654e34872925e95ee36730 [diff] | |
| parent | a786b7a70e9e0c3f4ed3e02616ca661e78de403a [diff] |
am a786b7a7: resolved conflicts for merge of 715b192a to lmp-dev-plus-aosp * commit 'a786b7a70e9e0c3f4ed3e02616ca661e78de403a':