| commit | d67ad203db73eb986f105cf65c85467ad610b221 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 28 13:07:57 2015 -0800 |
| committer | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 28 13:07:57 2015 -0800 |
| tree | 83a76e8a743f9ad3d2d9eb6418a3d964285d5910 | |
| parent | 318a0601909b77ac68607cddc6d87eea5e32c3b6 [diff] | |
| parent | 236828098ca1f0e144e0e08a7d79e13f82dda4e9 [diff] |
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320