diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 20:47:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 20:47:31 +0000 |
| commit | 05ecfd308d983755bc7cab39ba99a37c321f176b (patch) | |
| tree | f49649de42c650b905fb2c226de5b24e8c09489b /native/android/looper.cpp | |
| parent | 62958c7f3009f97dc185457feb01707d1eba740e (diff) | |
| parent | 33d3c53da021f0d044028860ace0f4ad817273f5 (diff) | |
| download | frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.zip frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.tar.gz frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.tar.bz2 | |
am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp
* commit '33d3c53da021f0d044028860ace0f4ad817273f5':
Move hidden ApplicationInfo flags into a separate field.
Diffstat (limited to 'native/android/looper.cpp')
0 files changed, 0 insertions, 0 deletions