tree 5970d9c68309718becd5424f7a9884706f917c8d
parent 925464f98679d3872f46b0365acce5a9cf2368bf
parent 41a3acc55ad8fd4fe6fba5f2b645da3191e020d1
author Hugo Benichi <hugobenichi@google.com> 1467159913 +0000
committer android-build-merger <android-build-merger@google.com> 1467159913 +0000

Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am: 41a3acc55a

Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2