OSDN Git Service

Merge "Support replace op in new pipeline" into nyc-dev
authorChris Craik <ccraik@google.com>
Thu, 7 Apr 2016 23:30:19 +0000 (23:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 23:30:19 +0000 (23:30 +0000)
am: d306065

* commit 'd30606575783acd8689cfac604cba51e537b6b77':
  Support replace op in new pipeline

Change-Id: Iab37f13a5fca72b2e581a897f7e03c17f9ce0b84

1  2 
libs/hwui/Android.mk

Simple merge