Alan Viverette b2449a399b am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev ...

* commit 'd86d7bce78a5f6e70bdac8f6d4bb1a968d440128':
  Use action mode context for ActionMode menu inflater

2014-10-29 22:55:09 +00:00

..

java

Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

2014-10-29 21:14:56 +00:00

jni

Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev

2014-10-29 21:12:08 +00:00

res

am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev

2014-10-29 22:51:47 +00:00

tests

Treat optimistic addresses as global preferred.

2014-10-29 19:11:58 +09:00