| commit | 31a98ad0da98227f3c76469e7a8a267c9539b6e8 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Mar 07 10:29:08 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Fri Mar 07 10:29:08 2014 +0000 |
| tree | c78392dbff169a61ae80e20759e109f4a70c2159 | |
| parent | 621d382baa8e300036f58e7acd43bda9ce87f854 [diff] | |
| parent | 8d1caa026caef3673799481c5fba454306f831e9 [diff] |
resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp Change-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85