Chet Haase 4b35637a4a Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev ...

am: 68311f8712

Change-Id: I5c5a18d57e5658262793f0bd67f8a9febda055cd

2017-05-25 23:05:43 +00:00

..

java

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev

2017-05-25 23:05:43 +00:00

jni

Merge "Creating HW bitmaps from RenderNode" into oc-dev

2017-05-25 19:01:10 +00:00

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07:00

res

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev

2017-05-25 23:05:43 +00:00

tests

Merge "Regression test: Menu item title updates." into oc-dev

2017-05-24 20:59:39 +00:00