| commit | fed399c39a89a04966cf9c7da300c8a1d6404453 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Dec 24 11:55:50 2015 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Dec 24 11:55:50 2015 +0000 |
| tree | b1c6399751c98babd3839bd4d5ff4a1f6a5c274c | |
| parent | 58b2329de74a73d2f0a7ed001e50cc39df33d9da [diff] | |
| parent | 7f65b4669c52976cd5713dae47b901707ed77110 [diff] |
Merge internal master into aosp/master.