[automerger skipped] Merge changes I77bc5b7c,I837d967d am: 54d0e55eba am: c2e7f83d95
am: 7b7090e351 -s ours
am skip reason: change_id I77bc5b7c24935c78bf484d5408134afc1c0c6ebc with SHA1 59ad42f7a6 is in history

Change-Id: Ia8a0dd52f11e4c4718d1b873e6bba0b31ed7fab1
tree: 46030ee79f585933215f999f732e060ce0358def
  1. nn/
  2. .clang-format
  3. CleanSpec.mk
  4. CPPLINT.cfg
  5. OWNERS
  6. PREUPLOAD.cfg