| commit | 05ecfd308d983755bc7cab39ba99a37c321f176b | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Feb 11 20:47:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 20:47:31 2015 +0000 |
| tree | f49649de42c650b905fb2c226de5b24e8c09489b | |
| parent | 62958c7f3009f97dc185457feb01707d1eba740e [diff] | |
| parent | 33d3c53da021f0d044028860ace0f4ad817273f5 [diff] |
am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp * commit '33d3c53da021f0d044028860ace0f4ad817273f5': Move hidden ApplicationInfo flags into a separate field.