| commit | 76038173a76f46d7c1845b72b337e1dc2b8335e1 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Fri Dec 19 22:16:47 2014 +0000 |
| committer | Vladimir Marko <vmarko@google.com> | Fri Dec 19 22:16:47 2014 +0000 |
| tree | 3441a8beeaace13c12097296abc9614d1c8a9b00 | |
| parent | d271272eadcb28ae758a8c0d03781923e347ae1d [diff] | |
| parent | c123642c9f470055ff4fef7797b652b4d5c9d4b2 [diff] |
resolved conflicts for merge of c123642c to lmp-mr1-dev-plus-aosp Change-Id: I7441e91ee4865571258fd64b6a9b49c42523c252