| commit | 10d8f605f2b8b6aec167bbb7f6707188a17ecd72 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jun 12 16:51:30 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 12 16:51:30 2018 -0700 |
| tree | c0d0364a4fe7c35ff66533b1773e11562a7f2f8c | |
| parent | c9c940aa7fb18b147b7663b75c5b415f6d0cad31 [diff] | |
| parent | 1f70a2e95c0f2aa9773822dd878e6eca63aa00f5 [diff] |
[automerger skipped] Merge "Frameworks: Remove complex boolean" am: 16eef1aad8 -s ours am: c997d66018 -s ours am: 1f70a2e95c -s ours Change-Id: I9932a6da917954e9b5c2c4cefb562e25e2bc08c8