OSDN Git Service

am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java subdirs of...
authorTim Murray <timmurray@google.com>
Mon, 3 Feb 2014 22:55:09 +0000 (22:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Feb 2014 22:55:09 +0000 (22:55 +0000)
* commit '47f9b9bc290dae448f07101c1fb6629285973514':
  Add new rs directory to list of Java subdirs of fw/base.


Trivial merge