OSDN Git Service

resolve merge conflicts of 7354c0e to nyc-mr1-dev
authorMohamad Ayyash <mkayyash@google.com>
Wed, 15 Jun 2016 17:02:21 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 17:02:21 +0000 (17:02 +0000)
commit1e90db6e81517fead1faf60e9a33cf618dcc6888
treeac5f094a9fd13baab31501afdb0a39e96186e946
parent52c6c48dbc608654038ca8cdc8eb40ee95b17b3d
parentc8966476a1b9443b8b433fb14a1f64832fe726a7
resolve merge conflicts of 7354c0e to nyc-mr1-dev
am: c8966476a1

Change-Id: Ief87c0cb7ff6fc0803b04ad69712068a4a186041