| commit | 2af51cacde8e8e15639352f96e46cbc9e9e6a4f6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 08 18:41:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 08 18:41:54 2014 +0000 |
| tree | a9b2734817b2b0351f99d36a6b3db9eb74140a32 | |
| parent | 6b779c6b61ec662f19f9ea30fd003c770799196c [diff] | |
| parent | 08df25419fd797aa0e8c22fc376fd8d3e071f0b9 [diff] |
Merge "resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp