Merge remote-tracking branch 'goog/nyc-mr1-dev-plus-aosp' into HEAD am: bbcc808d51
am: 0a595fe932

Change-Id: I6d4cc09f6f86e064f0b86d4a20fb3bdac3e44828
tree: 70ab56d38ba83f10bddc0017398fb353ec20ea0f
  1. library/
  2. navigationbar/
  3. tools/
  4. .gitignore
  5. PREUPLOAD.cfg