OSDN Git Service

Merge internal master into aosp/master.
authorNarayan Kamath <narayan@google.com>
Thu, 24 Dec 2015 11:55:50 +0000 (11:55 +0000)
committerNarayan Kamath <narayan@google.com>
Thu, 24 Dec 2015 11:55:50 +0000 (11:55 +0000)
commitfed399c39a89a04966cf9c7da300c8a1d6404453
treeb1c6399751c98babd3839bd4d5ff4a1f6a5c274c
parent58b2329de74a73d2f0a7ed001e50cc39df33d9da
parent7f65b4669c52976cd5713dae47b901707ed77110
Merge internal master into aosp/master.