tree 478bdf25f36bcfddb3499631bba1b4f6e9cfa12a
parent b0bb37328601fb25986dfe6ceb3786425fc3dfe9
parent 2d604852ce0e316c821136c186a605a0583db3a3
author Sean Lu <sean_lu@htc.com> 1498518569 +0000
committer android-build-merger <android-build-merger@google.com> 1498518569 +0000

Merge "[Resources] house keeping in TypeList" am: ff2e03cfce am: 516bd5f862
am: 2d604852ce

Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a