tree 078038783c868ecaaa7faee184f79720c1298b60
parent 8647c3366f6c6679aab1a3a1073392a9f6794335
parent 47f9b9bc290dae448f07101c1fb6629285973514
author Tim Murray <timmurray@google.com> 1391468109 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391468109 +0000

am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."

* commit '47f9b9bc290dae448f07101c1fb6629285973514':
  Add new rs directory to list of Java subdirs of fw/base.