| commit | c6f8209305d601be486c7dfda9ecbe85f23b36ab | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Dec 08 10:44:01 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Mon Dec 08 10:44:06 2014 -0800 |
| tree | 7d9ad4419b2bb8e95c4c24ee92b33c555bc9c7aa | |
| parent | 0b6b4e32c36ce143bfd095119b4939e4cf826021 [diff] | |
| parent | dd75ad0a7679e9c93aab36f9cb04527fc29386e6 [diff] |
resolved conflicts for merge of dd75ad0a to lmp-mr1-dev-plus-aosp (By basically reverting the AOSP change. I'll cherrypick the internal change to AOSP and we can try again in a way that won't block the merge queue...) Change-Id: Ic248f9fe57e6552131999df3763a66d5ffd9c415