commit | 810aa7a47f3dfe2b207e755121e801ae88bda0fa | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Wed Apr 16 18:26:04 2014 -0700 |
committer | Jason Sams <jsams@google.com> | Wed Apr 16 18:26:04 2014 -0700 |
tree | 9fc92026fa2a3f322d80507e3b048240baf6a1a8 | |
parent | fdc22cbe4d4fe6d4a97e6811c6f27169853f61f6 [diff] | |
parent | 0d6043caef208ee6c661eb17bcb376abfe90cd48 [diff] |
resolved conflicts for merge of 0d6043ca to klp-modular-dev-plus-aosp Change-Id: Ic0b72a5ae43d78ed224d2aeda25a83a79f9f26ec