| commit | 21ac7be215bc015055836c5df1a18282b370e99b | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Mon May 12 23:31:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:31:20 2014 +0000 |
| tree | db34eca2da5ec1662b262862fc44c323209fcb14 | |
| parent | fa229c6f93ddc2bde80009f9e83d2c727af782d6 [diff] | |
| parent | edd798affc20203b4be16920f85c6bee05e4a0db [diff] |
am edd798af: am 7b967dc1: am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp * commit 'edd798affc20203b4be16920f85c6bee05e4a0db':