tree eb30ce20b5e0d21b54e10ca9946c8ba97bea9a79
parent 470b7fe9ed30fb7a4247983175ee38df2f032cc7
parent 944edea8cb358e1863f4d84f0b372f3337eb0b3b
author David Pursehouse <david.pursehouse@sonymobile.com> 1425287075 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1425287082 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Add ASM dependency for standalone buck build

Change-Id: Ia7cd0f9596dbd988a3a1adb5f5968de9092dad9d