tree 19bc6d651d374807b776971ec359d6fc03bc5e66
parent e6320beff70f4934584facbf906ac1264041a83b
author Scott Main <smain@google.com> 1293039026 -0800
committer Scott Main <smain@google.com> 1294436314 -0800

cherrypick Change-Id: I9e1b530b5cbd43043d326c04bfc30b073bf9d388
fix bug 3295540

Change-Id: I1835444ff6dd0351a0f66ef565fa97a15dfea53f