| commit | f218d8824388174af16b9cb08b1e6da34fcde750 | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Wed May 21 03:47:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 03:47:58 2014 +0000 |
| tree | a60d5aeddacef98561f5e0ee6a05434e9d8bdc76 | |
| parent | 6fdea52a1570f4496d4e8d8f7315ff69d6a12bd1 [diff] | |
| parent | 0413efd261c9e6103ec65ff60af3ef22dfc80d19 [diff] |
am 0413efd2: (-s ours) resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp * commit '0413efd261c9e6103ec65ff60af3ef22dfc80d19': Set API version for KKWT. DO NOT MERGE