| commit | cb60f71c71ee0164ef32c997dd3c28ef6e3bae2d | [log] [tgz] |
|---|---|---|
| author | Jeffrey Vander Stoep <jeffv@google.com> | Mon Nov 16 23:33:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 16 23:33:53 2015 +0000 |
| tree | d0673997e003a9446fbcadfd709dff8c0fffcc38 | |
| parent | 4604b74603ea951c0f0d0fc2d9b6bd46ae54e245 [diff] | |
| parent | 9edb7bf4c6f9c59d0c469798d5936019e8199043 [diff] |
Merge "fix ApplicationInfo flag collision"