| commit | ff78b4b0057dba07924ea95efc3e173963a3aba0 | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Nov 04 07:28:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:28:18 2014 +0000 |
| tree | 09512ac5db15c4536dcf6af72bdcc0f7d04d01cd | |
| parent | 343eba1283d29160513f543734664ddbf607be01 [diff] | |
| parent | 5070b63f40a0296a6938524f5201842c37c6f685 [diff] |
am 5070b63f: am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours * commit '5070b63f40a0296a6938524f5201842c37c6f685':