Peng Xu 0ad55d5769 Merge \"Sensor: Make getId() more varied\" into nyc-dev ...

am: 94b61cb340

Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f

2016-06-23 03:32:46 +00:00

..

java

Merge \"Sensor: Make getId() more varied\" into nyc-dev

2016-06-23 03:32:46 +00:00

jni

Merge \"Sensor: Make getId() more varied\" into nyc-dev

2016-06-23 03:32:46 +00:00

res

Merge "Notify user when application does not support current display zoom" into nyc-mr1-dev

2016-06-23 03:10:11 +00:00

tests

Merge \"Fixed notificaiton Stress Test\" into nyc-dev

2016-06-21 23:35:06 +00:00