| commit | a6a2969e020ea16edbe24661d2b63f7f2bdf98b6 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Thu May 08 18:41:34 2014 -0700 |
| committer | Xavier Ducrohet <xav@google.com> | Thu May 08 18:48:26 2014 -0700 |
| tree | 20418d66af620c1c16281c39524879d6ebac605e | |
| parent | af3f1a54545dadc4606b74e16416712fbd3efecf [diff] | |
| parent | 05a7a955c12318a8f44c1fea467afde96a45342b [diff] |
Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8