tree 1832ae8839c373b06b7694016e7736bdfeefa531
parent 84cb35aa280a409031a0ce9ef6194684f32101df
parent 51e4b28c4871ba072d4f0c52375ea405231e37c4
author Martijn Coenen <maco@google.com> 1441921752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441921752 +0000

am 51e4b28c: am 48093547: am 5c732ee5: am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev

* commit '51e4b28c4871ba072d4f0c52375ea405231e37c4':
  Fix missing copyright headers.