tree f2918ed19af994072f9389619e96de9839ae39d5
parent d61ba0aae5c3155a3e232490129f97a2b3601663
parent b1f5ab447c6b44c810f5e97aeef381c93347a47a
author Marco Nelissen <marcone@google.com> 1413927820 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413927821 +0000

Merge "Don't signal an error at the end of a short file" into lmp-mr1-dev