commit | 72f6fde4563f9e5f2aff8211a54342d752aa7029 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Wed Oct 16 09:09:54 2013 -0700 |
committer | Kenny Root <kroot@google.com> | Wed Oct 16 09:09:54 2013 -0700 |
tree | 27bbd3defd2852191160fe393c8c080d628c5263 | |
parent | f90361244bacff74988fdcd33bc986e143860b10 [diff] | |
parent | 1a023f895320f4ad5360368ac50b88f9b33e0932 [diff] |
resolved conflicts for merge of 1a023f89 to klp-dev-plus-aosp Change-Id: I61c3d1ea509adc54b85bb6bb11350b6c466a8608