OSDN Git Service

am e858190f: am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java...
authorTim Murray <timmurray@google.com>
Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)
* commit 'e858190fc4bb0f7390efa232c963e8669adac4c8':
  Add new rs directory to list of Java subdirs of fw/base.


Trivial merge