Android n mr1 preview 1
Merge \"Fix misc-macro-parentheses warnings in frameworks/ml.\"
am: 5f58ad9b94

Change-Id: Ib60547d94f531e62160e61272c611c7d072c6c64
tree: 27cb740b2ee796284778a09c80cf2f17f6d7c4b0
  1. bordeaux/
  2. Android.mk