tree 35e339a557d86abc6b3233818723303f8270d843
parent b152876f2d92742deae1daead2ad02a290bc15c5
parent fbf2adaf6e0ea0492f1995eaab08a485c9291076
author Android Build Merger (Role) <android-build-merger@google.com> 1481739790 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481739794 +0000

Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp