| commit | 7ef9850d659dbfc587923b80a22e540d736aa2ec | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Apr 28 15:40:33 2016 -0700 |
| committer | Josh Gao <jmgao@google.com> | Thu Apr 28 15:40:33 2016 -0700 |
| tree | 20acf559acea1c2fca2fd80e7edc85587ea712f9 | |
| parent | c34133977981ac87cb77a49e9adbdaee8c494386 [diff] | |
| parent | 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a [diff] |
Merge remote-tracking branch 'aosp/upstream-v5.2.2' into xz Bug: http://b/27951762 Change-Id: Id763cd10ae6d20c6b448c0d1635bc035212c1318