Erik Kline 0d74973a08 am befe778c: Treat optimistic addresses as global preferred. ...

automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.

2014-10-30 19:10:04 +00:00

..

java

am befe778c: Treat optimistic addresses as global preferred.

2014-10-30 19:10:04 +00:00

jni

am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

2014-10-29 22:03:18 +00:00

res

am e8c3c3f7: am 2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev

2014-10-30 10:18:24 +00:00

tests

am befe778c: Treat optimistic addresses as global preferred.

2014-10-30 19:10:04 +00:00