tree a26a3dc9c0842936e1dfcb420a40e1812c53562e
parent 4662bee4d3e7d694cbbfeebaeae371400abb7a6f
parent 0a5c421ee5e85f1188a1ff7a9fdf9d8ad77b2869
author Susnata Basak <susnata@google.com> 1463158646 +0000
committer android-build-merger <android-build-merger@google.com> 1463158646 +0000

Merge "Merge "Added missing licensing information in source files." into nyc-dev am: b94abc7c9c am: 147f009526" into nyc-mr1-dev-plus-aosp
am: 0a5c421ee5

* commit '0a5c421ee5e85f1188a1ff7a9fdf9d8ad77b2869':

Change-Id: I709ba7a4ead5733455ab7690603f89d22f703018