| commit | d2628cb5956d699581eacbfa03577abfd2661789 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Aug 07 05:37:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 07 05:37:58 2014 +0000 |
| tree | f5a1f1e570ca90d7b2c767355da8785145e81881 | |
| parent | 9170a80c5b51db9423f56f18729df4d01eff064a [diff] | |
| parent | 56ef86df84ba7d8b26b663f49ae40f8c86b4b95b [diff] |
am 56ef86df: resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp * commit '56ef86df84ba7d8b26b663f49ae40f8c86b4b95b': resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp