| commit | 6be84e0ca9e04c8ebe7fc10c5e8eef7f4ac15a12 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Feb 01 17:54:38 2016 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Mon Feb 01 17:54:38 2016 -0800 |
| tree | d47930451c64072e8dca74545328e7ac0bd61b20 | |
| parent | c43b70f22d0653305513e26f5616382a86a43366 [diff] | |
| parent | d1acd1bea9bc2735b53ac68fa98891cab8c71d02 [diff] |
Merge remote-tracking branch 'aosp/upstream-dev' into merge Bug: 24264290