merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Update the assets of unlock and camera icons in filmstrip.

bug:7318891
Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
Fix SRI Pano orientation

 Bug: 7345511

Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
Fix build

Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
Add a triangle to the popup button view

bug:7442434
Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4
am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera

* commit '885717944569c84527a0ac9bc8a17f7c5c1f4b76':
  Fix scenario where launching Gallery launches Camera
am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'da700ab4ded11912e96606b2a0df3199bdbeb9d5':
  Import translations. DO NOT MERGE
Reconcile with jb-mr1-release - do not merge

Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b
am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2a8405d7e5439e1098598f47081530c550733f12':
  Import translations. DO NOT MERGE
Reconcile with jb-mr1-release - do not merge

Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
reduce size of tiny planet if malloc fails

bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE

* commit '8253c35a5d9564afbc667f7a9f42fdc0a734bcf8':
  reduce size of tiny planet if malloc fails - DO NOT MERGE
Reconcile with jb-mr1-release - do not merge

Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
Import translations. DO NOT MERGE

Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8
Auto-generated-cl: translation import