git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Sascha Haeberling [Tue, 21 May 2013 22:46:14 +0000 (15:46 -0700)]

am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '0cf42d07132b27aa1f50707fbf5aa30fde925cbf':
Make capture thumbnail tappable in video mode.

commit | commitdiff | tree

Sascha Haeberling [Tue, 21 May 2013 22:43:32 +0000 (15:43 -0700)]

am 80a3d636: Make capture thumbnail tappable in video mode.

* commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.

commit | commitdiff | tree

John Reck [Mon, 20 May 2013 21:45:14 +0000 (14:45 -0700)]

Fix height

Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0

commit | commitdiff | tree

Michael Kolb [Tue, 21 May 2013 22:10:51 +0000 (15:10 -0700)]

Fix selection highlight for tablets

Bug: 9044356

Fixes selection highlight for the new asset sizes.

Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a

commit | commitdiff | tree

Sascha Haeberling [Tue, 21 May 2013 18:26:13 +0000 (11:26 -0700)]

Make capture thumbnail tappable in video mode.

Bug: 9054122

Also make gotoGallery public for LightCycle to use.

Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc

commit | commitdiff | tree

Bobby Georgescu [Tue, 21 May 2013 20:42:09 +0000 (13:42 -0700)]

Fix potential synchronization issue in bitmap pool

Bug: 9072712

Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155

commit | commitdiff | tree

Doris Liu [Tue, 21 May 2013 17:17:44 +0000 (10:17 -0700)]

am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'bfce0515165aa381b730b4dd772132c41dea4e28':
Fix camera controls blink on startup

commit | commitdiff | tree

Doris Liu [Tue, 21 May 2013 17:14:11 +0000 (10:14 -0700)]

am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup

commit | commitdiff | tree

Doris Liu [Tue, 21 May 2013 17:12:03 +0000 (17:12 +0000)]

Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Tue, 21 May 2013 16:12:25 +0000 (09:12 -0700)]

am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'c6038e29aea5012a8c342d1a4c72aa26a9895519':
fix TinyPlanets Filter landscape crash

commit | commitdiff | tree

John Hoford [Tue, 21 May 2013 16:10:59 +0000 (09:10 -0700)]

am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash

commit | commitdiff | tree

John Hoford [Tue, 21 May 2013 16:09:17 +0000 (16:09 +0000)]

Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

commit | commitdiff | tree

The Android Open Source Project [Tue, 21 May 2013 16:01:56 +0000 (09:01 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I51461342bc651cb4e82db8a6a117d00a1017f4d9

commit | commitdiff | tree

Bart Sears [Tue, 21 May 2013 15:57:28 +0000 (08:57 -0700)]

am 1998968a: am a83166df: Bump up the version number to 1.1.40012

* commit '1998968a17c490276ffc46c7466401011109063b':
Bump up the version number to 1.1.40012

commit | commitdiff | tree

Bart Sears [Tue, 21 May 2013 15:55:47 +0000 (08:55 -0700)]

am a83166df: Bump up the version number to 1.1.40012

* commit 'a83166dfc97c6d45b03728a2ae32b085e91b8d0c':
Bump up the version number to 1.1.40012

commit | commitdiff | tree

The Android Automerger [Tue, 21 May 2013 14:46:56 +0000 (07:46 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

John Hoford [Tue, 21 May 2013 01:24:12 +0000 (18:24 -0700)]

fix TinyPlanets Filter landscape crash

bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05

commit | commitdiff | tree

Bart Sears [Mon, 20 May 2013 22:59:20 +0000 (15:59 -0700)]

Bump up the version number to 1.1.40012

Bug: 8607157
Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97

commit | commitdiff | tree

Doris Liu [Mon, 20 May 2013 22:21:05 +0000 (15:21 -0700)]

Fix camera controls blink on startup

Bug: 9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91

commit | commitdiff | tree

Ruben Brunk [Mon, 20 May 2013 21:27:40 +0000 (14:27 -0700)]

am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

* commit '96c48dee541fae960c23234a71d0f287e0e13489':
Avoid using region decoder for bad image types when setting wallpaper.

commit | commitdiff | tree

Ruben Brunk [Mon, 20 May 2013 21:23:34 +0000 (14:23 -0700)]

am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

* commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77':
Avoid using region decoder for bad image types when setting wallpaper.

commit | commitdiff | tree

Ruben Brunk [Mon, 20 May 2013 21:22:09 +0000 (21:22 +0000)]

Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

commit | commitdiff | tree

Sascha Haeberling [Mon, 20 May 2013 21:11:35 +0000 (14:11 -0700)]

am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

* commit 'f2697daa3a5f114216488022ca513cb7811075b9':
Make sure canceling a filter does not undo previous filter.

commit | commitdiff | tree

Sascha Haeberling [Mon, 20 May 2013 21:09:27 +0000 (14:09 -0700)]

am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

* commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce':
Make sure canceling a filter does not undo previous filter.

commit | commitdiff | tree

Sascha Haeberling [Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)]

Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Mon, 20 May 2013 18:34:24 +0000 (11:34 -0700)]

Avoid using region decoder for bad image types when setting wallpaper.

Bug: 8893617
Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe

commit | commitdiff | tree

The Android Open Source Project [Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7

commit | commitdiff | tree

John Hoford [Mon, 20 May 2013 14:45:30 +0000 (07:45 -0700)]

am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '22fcfeb20d601ca73dcfa374a46d3b370bef1929':
Disable zoom

commit | commitdiff | tree

John Hoford [Mon, 20 May 2013 14:44:09 +0000 (07:44 -0700)]

am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom

commit | commitdiff | tree

John Hoford [Mon, 20 May 2013 14:42:44 +0000 (14:42 +0000)]

Merge "Disable zoom" into gb-ub-photos-bryce

commit | commitdiff | tree

The Android Automerger [Sun, 19 May 2013 12:55:36 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

John Hoford [Fri, 17 May 2013 00:37:46 +0000 (17:37 -0700)]

Disable zoom

Bug: 8791729

Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 22:52:21 +0000 (15:52 -0700)]

am 5ba97880: am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '5ba9788055cce978a82a96367625b671471a86f4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 22:52:20 +0000 (15:52 -0700)]

am 2e4c852c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '2e4c852c525ceceb7176f61e1d94a4fed9b29d15':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 22:51:00 +0000 (15:51 -0700)]

am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '082541a730e56092b948580a8e8040be78979e23':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 22:50:11 +0000 (22:50 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 22:49:53 +0000 (22:49 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Fri, 17 May 2013 22:39:53 +0000 (15:39 -0700)]

am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders

* commit 'cf4b66a9a4d794d93c75798fab81fad006897167':
Highlight selected option in FX and Borders

commit | commitdiff | tree

Michael Kolb [Fri, 17 May 2013 22:36:52 +0000 (15:36 -0700)]

am 1a266f16: Highlight selected option in FX and Borders

* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders

commit | commitdiff | tree

Michael Kolb [Fri, 17 May 2013 16:09:21 +0000 (09:09 -0700)]

Highlight selected option in FX and Borders

Bug: 8791729

Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4

commit | commitdiff | tree

The Android Open Source Project [Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 19:42:25 +0000 (12:42 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 17 May 2013 19:41:48 +0000 (12:41 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 23:00:50 +0000 (16:00 -0700)]

am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '8d07b582341df0262eda91da7fbed5938bdd2337':
Switch back to old crop

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:59:23 +0000 (15:59 -0700)]

am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:58:09 +0000 (22:58 +0000)]

Merge "Switch back to old crop" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:18:50 +0000 (15:18 -0700)]

Switch back to old crop

Bug: 8950255

Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:34:01 +0000 (14:34 -0700)]

am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '1420dea329586ad491ea93a90a59d0d78b28d953':
Add new overlay icons for sharpen and curves

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:32:42 +0000 (14:32 -0700)]

am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
Add new overlay icons for sharpen and curves

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:31:31 +0000 (21:31 +0000)]

Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:07:29 +0000 (14:07 -0700)]

Add new overlay icons for sharpen and curves

Bug: 8791729

Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 21:02:47 +0000 (14:02 -0700)]

am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '5c95e49faad25acca47639ed97ada8b50567793e':
toUpper() some strings

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:59:20 +0000 (13:59 -0700)]

am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
Fix reset

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:58:02 +0000 (13:58 -0700)]

am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:56:29 +0000 (20:56 +0000)]

Merge "toUpper() some strings" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:54:50 +0000 (13:54 -0700)]

am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:52:31 +0000 (20:52 +0000)]

Merge "Fix reset" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:50:50 +0000 (13:50 -0700)]

toUpper() some strings

Bug: 8791729

Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 20:48:04 +0000 (13:48 -0700)]

am c792b72a: am fef58a0f: change edit icon

* commit 'c792b72a0b2394cdd8648ad867a0a36f0ad937f4':
change edit icon

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 20:46:27 +0000 (13:46 -0700)]

am fef58a0f: change edit icon

* commit 'fef58a0fc969cc09b02cb9945da8d553698681e3':
change edit icon

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 19:55:21 +0000 (12:55 -0700)]

change edit icon

bug:8988179
Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0

commit | commitdiff | tree

The Android Automerger [Thu, 16 May 2013 12:55:41 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 16 May 2013 12:44:03 +0000 (05:44 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7

commit | commitdiff | tree

John Reck [Wed, 15 May 2013 21:45:34 +0000 (14:45 -0700)]

Fix reset

Bug: 8791729

Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:35:17 +0000 (13:35 -0700)]

am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'f8d78d2fda5b706e5932f8d428f6316f4e68a32a':
Grey out undo/redo/reset according to state

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:35:16 +0000 (13:35 -0700)]

am da046959: am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit 'da046959e0b990e532e774779c50b2b5c1d7a785':
Correct label position after rotation

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 20:34:58 +0000 (13:34 -0700)]

am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '0e0644ad8538253bfb0e07bdafaa2dacba6c6a56':
Fix another annoying warning log spam

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:57:37 +0000 (11:57 -0700)]

am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'c2f813a36711742af3b23743ef1849cec13a9a95':
Grey out undo/redo/reset according to state

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:57:36 +0000 (11:57 -0700)]

am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit '655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:55:19 +0000 (18:55 +0000)]

Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:55:08 +0000 (18:55 +0000)]

Merge "Correct label position after rotation" into gb-ub-photos-bryce

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 17:37:57 +0000 (10:37 -0700)]

am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 17:25:40 +0000 (17:25 +0000)]

Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

commit | commitdiff | tree

Marco Nelissen [Wed, 15 May 2013 14:58:32 +0000 (07:58 -0700)]

am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev

* commit '6e59979de90664d5e93d25a4bf2e165de2e20ac2':
Enable virtualization

commit | commitdiff | tree

Marco Nelissen [Wed, 15 May 2013 14:56:19 +0000 (14:56 +0000)]

Merge "Enable virtualization" into jb-mr2-dev

commit | commitdiff | tree

The Android Automerger [Wed, 15 May 2013 12:55:39 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Michael Kolb [Tue, 14 May 2013 22:43:28 +0000 (15:43 -0700)]

Grey out undo/redo/reset according to state

Bug: 8791729

Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827

commit | commitdiff | tree

Michael Kolb [Tue, 14 May 2013 21:28:14 +0000 (14:28 -0700)]

Correct label position after rotation

Bug: 8963421

Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:28:05 +0000 (14:28 -0700)]

am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '18f19a722c327edcf8f84fc5494f13cbbe816a4d':
Pause face detection when review captured images

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:26:46 +0000 (14:26 -0700)]

am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]

Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Tue, 14 May 2013 19:46:10 +0000 (12:46 -0700)]

am a24c4906: am 33f2a880: Only link librsjni in unbundled branches.

* commit 'a24c4906455e02f1a8cc8db98dd2280a1d19eca4':
Only link librsjni in unbundled branches.

commit | commitdiff | tree

Tim Murray [Tue, 14 May 2013 19:44:55 +0000 (12:44 -0700)]

am 33f2a880: Only link librsjni in unbundled branches.

* commit '33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
Only link librsjni in unbundled branches.

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]

Pause face detection when review captured images

Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c

commit | commitdiff | tree

The Android Automerger [Tue, 14 May 2013 12:55:38 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]

Only link librsjni in unbundled branches.

bug 8939828

Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a

commit | commitdiff | tree

Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]

Enable virtualization

When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/8767565

Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:38:16 +0000 (11:38 -0700)]

am c5fb797d: am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit 'c5fb797d41515e15fba40042bc947543b5e9896c':
New count down beeps.

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:34:47 +0000 (11:34 -0700)]

am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit '25d69c11831fabf8f4e474aaf17b05dd001979ce':
New count down beeps.

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]

Merge "New count down beeps." into gb-ub-photos-bryce

commit | commitdiff | tree

ztenghui [Sat, 11 May 2013 00:44:23 +0000 (17:44 -0700)]

Fix another annoying warning log spam

bug:8771541

When we set up the icon rendering, we need to set the geometry, too.

Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]

New count down beeps.

Bug: 8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a

commit | commitdiff | tree

The Android Automerger [Mon, 13 May 2013 12:55:53 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

George Mount [Fri, 10 May 2013 06:40:45 +0000 (23:40 -0700)]

am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers.

* commit '09e1a5ac2cdd9bccd543df91859152a0aa3c3879':
Remove GL dependency on unused stencil buffers.

commit | commitdiff | tree

George Mount [Fri, 10 May 2013 01:04:58 +0000 (18:04 -0700)]

am ac94740c: Remove GL dependency on unused stencil buffers.

* commit 'ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.

commit | commitdiff | tree

George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]

Remove GL dependency on unused stencil buffers.

Bug 8884435

Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:22:08 +0000 (09:22 -0700)]

am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit 'f4733e6f0f8c7012a448f375627478bfb9e53c96':
Fix the verbose log

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:19:40 +0000 (09:19 -0700)]

am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit '9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b':
Fix the verbose log

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]

Merge "Fix the verbose log" into gb-ub-photos-bryce

commit | commitdiff | tree

The Android Automerger [Thu, 9 May 2013 12:55:35 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev