Dianne Hackborn 1c2f6ca136 am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev ...

* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
  Fix issue #18510117: Returning from an activity started with...

2014-12-02 19:40:10 +00:00

..

java

am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

2014-12-02 19:40:10 +00:00

jni

am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

2014-12-02 00:48:33 +00:00

res

am 920c27b2: am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev

2014-12-02 00:56:48 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00