tree d712469d21cb7c7c56724d603cd326ba140d212d
parent 1f7be323252a3c3b061454ad3e3ec5436a2b71fb
parent df6da040e00cba255cad64d2d231aae62928607a
author Makoto Onuki <omakoto@google.com> 1466195377 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466195378 +0000

Merge "Update manifest shortcut XML schema" into nyc-mr1-dev