| commit | 2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Sep 16 12:46:38 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Sep 16 12:46:38 2014 -0700 |
| tree | 477c9f45d3278c04f3fe8bba235979c6b1938452 | |
| parent | 9d859fee5ebd5eda19c3a1c4e1c320903c679d43 [diff] | |
| parent | d9714d344ce5688bb8c170b74cacd500d2c47662 [diff] |
resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp Change-Id: I1c29b6cbed8a012f271c16b4875b954d2bddf648