| commit | b5223c08d8263954d1418425816e16e0a49573b4 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Tue Apr 07 18:23:36 2015 -0700 |
| committer | Chris Elliott <chriselliott@google.com> | Tue Apr 07 18:23:36 2015 -0700 |
| tree | 8571c9b6135f86a3d9d56597bc67602306386bbd | |
| parent | 02e1ac38fd9b740fe548b6b516a2fc83ce790447 [diff] | |
| parent | 679e399b4166628e9d1c66ba91ac6b95562f2131 [diff] |
resolved conflicts for merge of 679e399b to lmp-mr1-dev-plus-aosp Change-Id: Ibed75bf21cd7aacabec41fc620824141cb865b88