| commit | 869299a56210e5534a51f21b3a26b0dbff762fbd | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jun 24 21:15:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 24 21:15:46 2014 +0000 |
| tree | d09086a1bb1b3b4a095fcbe342ce7396902738a3 | |
| parent | aea2ef7fffd679a04e221e310812af32c938a5e0 [diff] | |
| parent | 7c256eada7a8a8eb81296b0b992cf6b69eda75f1 [diff] |
am 7c256ead: resolved conflicts for merge of 50e7d733 to klp-modular-dev-plus-aosp * commit '7c256eada7a8a8eb81296b0b992cf6b69eda75f1': Update black list for klp-modular-dev