| commit | e5911f31286179c1e4dc9bb2691e5098c6e3d20e | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Sat Aug 24 08:21:41 2013 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Sat Aug 24 08:21:41 2013 -0700 |
| tree | 72af73ecf9f35ceafef7f2bb9d8f60484b809210 | |
| parent | 9fd0cf81702d083b39a839b07ad75d2ff0ac277d [diff] | |
| parent | 937c374225c2f98862e1746c9509970d1b2257d6 [diff] |
resolved conflicts for merge of 937c3742 to klp-dev-plus-aosp Change-Id: I4c0ad42ea3802cd232c80e5589af8a8e25f88a60