commit | 45effa2f6a5deff35096584acd0edf9573dc8e1b | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Tue Jun 20 08:53:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 08:53:58 2017 +0000 |
tree | d3acda11db449d3a005bd0480c37ee6b6567ced2 | |
parent | dcfaccd3cc65b48eeb1c3730f2be09670550658f [diff] | |
parent | 073299c3255bd4b386c864b922baf2a9f71d1991 [diff] |
Merge changes I4d2be5d9,I34706201 into oc-dr1-dev am: c649a9978a -s ours am: 073299c325 -s ours Change-Id: I8dfc0da75cede32a4161760eeca34e84dd81c406