diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-27 18:28:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-27 18:28:18 +0000 |
| commit | a5b55a017a984608eacdf414bc1cbcd7615f1c13 (patch) | |
| tree | b032022984bed52deb52e86528f5b008dc6aec9f /telephony/java | |
| parent | 20186c4b68b613266c694639319137f522607076 (diff) | |
| parent | b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9 (diff) | |
| download | frameworks_base-a5b55a017a984608eacdf414bc1cbcd7615f1c13.zip frameworks_base-a5b55a017a984608eacdf414bc1cbcd7615f1c13.tar.gz frameworks_base-a5b55a017a984608eacdf414bc1cbcd7615f1c13.tar.bz2 | |
am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
Frameworks/base: Add debug.gencfi property
Diffstat (limited to 'telephony/java')
0 files changed, 0 insertions, 0 deletions