commit | 74059eb379ea07b9c7f46bf2112a60de8e4cfc8e | [log] [tgz] |
---|---|---|
author | Tom Taylor <tomtaylor@google.com> | Tue Dec 06 16:26:14 2016 -0800 |
committer | The Android Automerger <android-build@android.com> | Mon Dec 19 14:45:53 2016 -0800 |
tree | 7691c59f08159384908a2e20ff99a2fe8b31499b | |
parent | 30ab77f42d20c33c0aa9e6ffd2b164d096db32dd [diff] |
resolve merge conflicts of eafd58a to nyc-dev Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962 (cherry picked from commit a43c5c5f18d966355a63db194c931e02267a2695)