Merge goog/master@c8da37c into stage-aosp-master.
authorXin Li <delphij@google.com>
Thu, 16 Jun 2016 02:58:16 +0000 (19:58 -0700)
committerXin Li <delphij@google.com>
Thu, 16 Jun 2016 02:58:16 +0000 (19:58 -0700)
commit38365a16347bc8b553cb27c585bc8f35a0dae84d
tree8ae62d9e2ce600b298dc181dc810d56965f99dc5
parent400f824feb62897b7d0175ee55873d752fc1ad13
parentc8da37c8c21a1d3266b2b3076b2beeaaf553b98c
Merge goog/master@c8da37c into stage-aosp-master.