OSDN Git Service

resolved conflicts for merge of 3028394c to stage-aosp-master
authorNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 12:12:37 +0000 (12:12 +0000)
committerNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 12:12:37 +0000 (12:12 +0000)
commit4ed472ab33e78391c0b084ed3908019e06b7dfe5
tree2135110bff4085ec90113a260f0a7eac519ba76b
parentfa945c105b4f7bb3e3844e8ce467ca701d5f3a9f
parent3028394c4691db9dec6bde04a7ed927e7501bd6a
resolved conflicts for merge of 3028394c to stage-aosp-master

Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
libs/hwui/Android.mk
libs/hwui/Layer.h