commit a3da4623b16d9f93efed5d9ec2ee30802840cd2a
author Craig Mautner <cmautner@google.com> Wed Nov 13 18:47:54 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 13 18:47:54 2013 -0800
tree 8f5423c653b34c91f084bd0abcc2ae9b0f63a956
parent 1b967a1b23cd237d3df49f7b0e0af771c8aef077
parent 1fbb5da29a4ebef1d758dffad9c2704a5932d223

am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev

* commit '1fbb5da29a4ebef1d758dffad9c2704a5932d223':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
  Add null pointer check.
  Import translations. DO NOT MERGE
  Small DocumentsProvider doc improvements.
  Keyguard isn't visible if it hasn't been drawn.
  Enable fast camera transition when launched from navbar
  Reduce camera launch time by about 250ms.
  camera2: Remove prior repeating request when setting.