| commit | 24950f8ad4b13d5d739889e39ecea95a7b6ffbf5 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu Dec 10 12:42:34 2015 -0800 |
| committer | Dan Willemsen <dwillemsen@google.com> | Thu Dec 10 12:42:34 2015 -0800 |
| tree | 2fb64d165aa8cd05e79f88238eddb69dccde25ab | |
| parent | a60c366614ac22e9399c8ad51c7815b2ee5ff852 [diff] | |
| parent | eb97a6e7a1afa6d4817545bec3304e906ecc35f7 [diff] |
Merge remote-tracking branch 'aosp/upstream'