Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp
* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
GlobalTime: Perform Zoom In and Out only after initialization
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).
Change-Id: I10e7736527a934029364c9c83f147f94574f5488
Merge commit '23bff5dd80c782ac6d4f67caa57230f265fca77e' into gingerbread-plus-aosp
* commit '23bff5dd80c782ac6d4f67caa57230f265fca77e':
Add API demo for picking a contact with a permission grant.
Merge commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp
* commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb':
Replaced deprecated Contacts Api with ContactsContract
Merge commit '704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp
* commit '704da60406d259c5a3bfe273755861f80575d7ca':
Disable Proguard for the SampleBrowerPlugin
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
Merge commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1' into gingerbread-plus-aosp
* commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1':
don't strip resources so it work on all devices
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp
* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread
* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
Merge commit 'a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp
* commit 'a7c85d92351070605b93176c1f691f4f80321ad5':
Take screen rotation into account
Merge commit '4619318dd1398bd4f87b2e74827b9fb9796a2643' into gingerbread-plus-aosp
* commit '4619318dd1398bd4f87b2e74827b9fb9796a2643':
Sample code to illustrate how to use the accelerometer
this is a small particle + physics system that shows how
to integrate accleration data into positions accurately.
Change-Id: I3bbdc433f52d98464269ac8cb996c4cf037ae8d6
Merge commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp
* commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e':
Copy over updated NDK APIs and follow other API changes.
Merge commit '7e7d75eefd23debadb67e894bc152e479bdb714f' into kraken
* commit '7e7d75eefd23debadb67e894bc152e479bdb714f':
Add API key to BackupRestore sample code.
Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp
* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
Add API key to BackupRestore sample code.