Erik Kline c706f68d21 am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d ...

* commit '0d74973a08ebe4b7547100f7d60db07152cbbcd4':
  Treat optimistic addresses as global preferred.

2014-10-30 19:15:45 +00:00

..

java

am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d

2014-10-30 19:15:45 +00:00

jni

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

2014-10-29 22:07:32 +00:00

res

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

2014-10-30 10:26:34 +00:00

tests

am befe778c: Treat optimistic addresses as global preferred.

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