am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev
am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev

* commit '95637018052655783a25e8123c5b6f898c4171e6':
  Make --non-constant-id generates non final IDs for styleable.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base