| commit | 77b170cedca2828d8c40ca33b820f5911a558326 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 28 16:10:53 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed May 28 16:10:53 2014 -0700 |
| tree | a3c525c0bdd9c33756d6ff997730d1b3356dc5e0 | |
| parent | a487fb77dff1a86fbd160694de41e32b74f10cb1 [diff] | |
| parent | 452c592191a147ae1175db775bc3e7e8e0311855 [diff] |
resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678