OSDN Git Service

resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp
authorDan Willemsen <dwillemsen@google.com>
Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
committerDan Willemsen <dwillemsen@google.com>
Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)
commit238f4aafd211b1ce7c6e6d6d672e8e9301c99ed5
tree24784de960712a88b1a22fbd3640226a6ec1a308
parentb4da199b68f6707fb4d9b664055fc752bfb5c60d
parentdfcf2e0cbbd30dd0b76ba2839922a29ae5569132
resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp

Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b
core/config.mk
core/envsetup.mk